From 5b59c8de0c9270ba64ec5d15e1a0ad272f9138a6 Mon Sep 17 00:00:00 2001
From: "djm@kirby.fc.hp.com" <djm@kirby.fc.hp.com>
Date: Wed, 14 Sep 2005 15:33:52 -0600
Subject: [PATCH] Add needed header files that are buried/nested in x86

---
 linux-2.6-xen-sparse/drivers/xen/blkfront/block.h  |  1 +
 linux-2.6-xen-sparse/drivers/xen/console/console.c |  1 +
 linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c | 14 ++++++++++++++
 .../drivers/xen/xenbus/xenbus_dev.c                |  1 +
 4 files changed, 17 insertions(+)

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
index 8a2acd6046..5d1e38564e 100644
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
@@ -47,6 +47,7 @@
 #include <linux/devfs_fs_kernel.h>
 #include <asm-xen/hypervisor.h>
 #include <asm-xen/xenbus.h>
+#include <asm-xen/gnttab.h>
 #include <asm-xen/xen-public/xen.h>
 #include <asm-xen/xen-public/io/blkif.h>
 #include <asm-xen/xen-public/io/ring.h>
diff --git a/linux-2.6-xen-sparse/drivers/xen/console/console.c b/linux-2.6-xen-sparse/drivers/xen/console/console.c
index 18ed52c038..087891ee4d 100644
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c
@@ -49,6 +49,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
+#include <asm-xen/xen-public/xen.h>
 #include <asm-xen/xen-public/event_channel.h>
 #include <asm-xen/hypervisor.h>
 #include <asm-xen/evtchn.h>
diff --git a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
index 07317bdb3e..98a6fd95d0 100644
--- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
+++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
@@ -26,6 +26,8 @@
 #include <asm/uaccess.h>
 #include <asm/tlb.h>
 #include <asm-xen/linux-public/privcmd.h>
+#include <asm-xen/linux-public/hypervisor.h>
+#include <asm-xen/xen-public/xen.h>
 #include <asm-xen/xen-public/dom0_ops.h>
 #include <asm-xen/xen_proc.h>
 
@@ -76,6 +78,18 @@ static int privcmd_ioctl(struct inode *inode, struct file *file,
                 "g" ((unsigned long)hypercall.arg[4])
                 : "r11","rcx","r8","r10","memory");
         }
+#elif defined (__ia64__)
+       __asm__ __volatile__ (
+           ";; mov r14=%2; mov r15=%3; mov r16=%4; mov r17=%5; mov r18=%6; mov
+r2=%1; break 0x1000;; mov %0=r8 ;;"
+           : "=r" (ret)
+           : "r" (hypercall.op),
+             "r" (hypercall.arg[0]),
+             "r" (hypercall.arg[1]),
+             "r" (hypercall.arg[2]),
+             "r" (hypercall.arg[3]),
+             "r" (hypercall.arg[4])
+           : "r14","r15","r16","r17","r18","r2","r8","memory");
 #endif
     }
     break;
diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
index c5bdeb4e8c..c46c9fe6bb 100644
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
@@ -40,6 +40,7 @@
 #include "xenbus_comms.h"
 
 #include <asm/uaccess.h>
+#include <asm/hypervisor.h>
 #include <asm-xen/xenbus.h>
 #include <asm-xen/xen_proc.h>
 #include <asm-xen/linux-public/xenstored.h>
-- 
2.30.2